fix CM 11 compatibility