Settings fix
Fixes