Fix: Option to limit was not used everywhere.