added setting fix