Fix stages callback running too soon