Fix for import as module replacement