If this is a bug, add new tests for it and then fix it.