Fix for #918