Do not add $ anymore before wrong places