8f60837 prep for DB fix