Fix bug from mailing_list

Is closes #16