Clearer and better performing version, also more likely to actually work as expected :)