Make it compatible with cm sources Thanks Sachin