Trying to get rid of some unexpected behaviours