Fixed Settings Bug