Fixing #710