Fixed #1121