fix $ stuff