#53 Fix illegal offset