Fixed Issue #276