Annoying ampersand bug was fixed completelly