Small improvement in lay-out