mojo 4.x fix