Issue #82 fix [trunk]