Fix issue with offset + clear