Fixing bugs #EE