Fix over-enthusiasm