Attempted onCal fix