Deal with bad data
Merge branch 'develop'