Fixed import gen