closes #590