Issue #197, edit code