Fixed #1405