Trying to fix failing importing

Relate to #1610