* fixed issue #366
* fixed #350