fix issue https://trello.com/c/HCgbNssu