Fix issue 4011