closes #508