entities were not being exported correctly before