closes #225 again