more mojo 5.x compat