import fix (included in the "wrong" branch b/c trivial)