fix # functions