Some fix for phase two