Improve performance (a little bit)