closes #470 (I hope)