Fixed #1217
dev build