Second attempt on #66