RIM performance dropped since commit #31eac

**Describe the bug**
RIM performance is worse than before. After investigation it seems that this happened after #194.

**Expected behavior**
RIM performance as before

