Fixed Issue #198