Fix #23 import issue