BugFix <3 unit-testing. Even 'trivial' stuff needs testing.