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