Bugfix limit and offset