Tweak to keep array size down