Contribute to crosscompatibility, #7