closes #529