Fix limit and skip