Fix data loading problems.
Review changes.
Merge pull request #1446 from pp-mo/lbc_data

Fix data loading problems.