import bugs fixed