only call if needed

Change-Id: Ia816474e8d8368b5674ead543bb5e613adf86a72