Fixing Settings Bug