Temporary fix for ICS