Odyssey related bugfix