closes #624