Slightly improve performance