Bug (and self stupidity) fixing