Fix for #983