Fixing annotation import, closed #509