update: improve compatibility