bugfix - https://trello.com/c/ki10y5Rp/14--