Tweaked failing code for review