Import optimization
Bugfix