Fix for #954