COOPR-578
Type fix