Fixed stages callback so it doesn't get called before completing