closes #633