fixed #1207