Note that #87 is trivial now