Fix for new db crap