Fixed #1224
dev build