Fixed #1500