issue #1: fixing imports