Fix to resolve #946