properly fixed #1274