fixed #361