Fixed problem with data inclusion