This should actually be correct now; see comment in file