support phase bugs fixed