Optimization and don't return too early