Bug fix in imports