Small optimization and fix item collection