fixing eol bugs