Fix for #993