Fixed #935