Fixes performance problem in ORS