Or rather "fix", because I am still not sure whether the current behaviour can be useful or not