Fixes #7. Closes Asana Task #4313857731146