Fixes the settings bug #15