Fixed bugs that were raised by monkey tester #168

Closed georgepaw closed 9 years ago