closes #408