Forgot to add some logic to previous commit...