You're right! We should make this change (but test it pretty good)