closes #484