Fixed #1134