Fixed Issue #273