Fixed #1495