Fixed #725