One more minor performance improvement