More fixing of $ issue