fixed #1084