Fixed import to keep compatibility with older versions