OC-3576, fixed