Mazetest fix with mesh