Fixes (https://trello.com/c/C6c5PDbQ)