Fixed yet another bug in stage2