closes #421