Fix for #613