fixed #407