fixed #354