Changes for #236