for some reason, it looks like `std::find_if()` does not work on ubuntu 16.10 with clang and enabled optimizations. since as far I can see this 'if' is a minor performance improvement in non-time critical code, let's just remove the condition.