Fix for #21, with addition to the article_form as well