Fixes https://basecamp.com/2294464/projects/5443601-pitm-development/messages/24731607-some-edits-updates#comment_155305934