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