Fix for non-config import