Fixing peter's bikeshedding