Bug Fix for Issue #110