fixed #39 #28