Fix importing,version bump,add FIXME comment