Fix for not saving settings