Fixing import error (see f70354f)