fixed #309