PR for #265

As per #265