one remaining wrong function call after merge fixed