Fixed bugs in Stage model