Fix compile error; see FIXME text in source for details