FIX: Preserve public API by introducing return_n_iter param