Fixes #2. Closes Asana Task #4313857731161