Fixing require order