Fix a severe issue with last commit.