Fix issue https://trello.com/c/amtnJTOk