DERP! closes #931