Fix a big problem with last commit