Fix database values, use local version instead