first stab at this fix