Fixed #1642
Fixed #1641