fixed #27 #28