Small perfomance fix