OCD tweaks
CRUCIAL FIX