A unit test reproducing the issue would be helpful.