closes #490