Fix settings issue