Fixing the dynamic imports