Fixed #1485