Move if statement further down

Just a small optimisation, we don't need this if statement until we know this isn't the "bucket" field, so move it down a bit.