Fix for settings issue
merge resolved