merge lukaselmer patch to remove $