Tried to fix the mess of the last commit