arrange special case. closes #369