Trond's fix for Mark's build issue