partial work-around for database save failure