Limit listing bugfix