Added a new testcase to the unit-tests and your right :( back to the drawing board......