Hacky fix to hacky offset code