Possible fix for importing bug