Pay more attention

Change-Id: I771e8abfb5fe1399b93c0cd7df936167af665508