Will add a few unit tests to look into the issue deeper.