Correcting small "bugs" :)