Fix for #710