removed "todo" and added test for issue #622