Database_extend fix