Small perfomance improvement