stupid bugs fix