fixed 5C issue