closes #814