Fixed Issue #191