-- fix missed common functions