I think that i may have found a non exercise bug

Updating it with things I mentioned in the above comment

@JoahG could you just check quickly this won't break anything please, thanks!