Tweak a ruby expand condition, really need to redesign this stuff