Fix for issue #86 [trunk]