Fixed bugs in 1.3, 1.4, 1.5