Not sure how to simplify more

If you check out the other PR, I think this change has the least impact to the code base, and ends up with a better behaviour