is their a test for this change? is it needed here? (I agree this may be a problem). Can do this is another PR?