Fix for :s in commands