Fix too diffensive code