Fixed #733