Fix for #923