offset & order bugfix