Fix fast logic