ometa: half of the fix was not commited.