Fixed an overeager fix in the last commits