BugFix for OBR
Improved performance