closes #killme-5