Fixed Issue #278
Fixed Issue #293