Fixed #710