Add unit test that demonstrates this fixes the problem