Fixed #1109