Fixed bugs. #111 #108