Making a square peg fit in a round hole...