BugFix with STAGEFINISH