fixing bugs for EOL