Try to improve performance