Fixing my own fix on the other commit