Fix for #975