(fix) fixing bugs