Problem(s) fixing