Incorporated the +1 offset from Rei
Fixed a crash that was caused by a typo.