fix issue #https://trello.com/c/Xqk12MGi