Fix imports for issue #19