Fix up of #52