Improve perfomance slightly