fixed C4505