Fixed #833