Fix https://trello.com/c/wJNnl2Dp