fix logic for handling manual settings