Fix for Charles complaints