Import and small form bug for #25