Slight logic error in previous commit