Fix Advancement handling (#2578)* Fix Advancement handling* Cleanup* Comment* Cleanup (commit: f9800e1)