Fixed #912