Fixed #1190
Fixed #1184