Fix issue #97 [trunk]