Bug in card #58 fix. Rolled back fix.