Fixed bundle include inconsistencies - I AM THE LAW