closes #547