Another minor update to #11