setup and import fix