Your hyperfocus may be off. At 21mm, only the tiniest focus adjustment is required and my guess is that you're focusing too close. Or you may have field curvature; I don't know about that lens. Are objects in the centre of the field at the focus distance sharper than those at the edge?