fixed #276 #277