more fixes with incorrect stage number