Fixed pitfall detection