closes #325 again