fixed #1477