fixing bugs =)