V1.2 Fixed bugs