Bugfix on import