Issue #82 fix [2.1.3]