Fixes #14. Closes Asana Task #4314445769626