Fix #735, avoid using DynamicImport-Package