Fix for issue #86 [2.1.3]