Changes for #243