fix https://trello.com/c/vNWMtnZn
fix https://trello.com/c/nLqfZEhS