Fixed random imports