Fixed #1550