fixes https://trello.com/c/vRHoqhLW and https://trello.com/c/RmqW6D2O