fix helper factory