Fixed #1230
dev build