fix yet more bug