OC-2805
Type fix