current bugs fix