fix #6 and #7

For some reason, a wrong import slipped through.