merge pull request
Maybe also fix double-gc click
version