Added fix for Issue #1