[PATCH 0/2] Fix https://trello.com/c/7tlG7HCT/272