Fixing clients Habits