Fix issue #97 [trunk]

Fix for issue #97