Fix to error 36971