removed phase 2.1 bug