Another performance improvement