Label change issue #16