Fixed #1446