[BUGFIX] Reintroduce final trick for step 6