Fixed Issue #278