Fixed #1166