early bugs fix