Fixed #1132