Fixed #736