PR for #274