Tweaks for Chris Field problem