Fixbug of https://trello.com/c/txZhRmIH/30-gnvm-gnvm-use-x-xx-xx