[FIX] Illegal offset

Fixes #1382 once merged.