try to fix the mojo bugs