fix in generic handling