Workaround for Imports Bug