Fix confused data dir

fixes #1172 -- but note this PR builds on #1249 so fix that first