closes #481