Fixed #1641