Settings Bug Fix