Fixed the issue

Last "fix" was just crap. No test cases were actually run. That's whar
you get for coding while sitting in the passenger seat on the Autobahn
;)