Issue 901

Changes for #901