closes #480