Fixed #1229