Slight performance improvement