Fix for duplicate exec definition

Change-Id: I57ce29eaeed5335aaf23df9a0990a2c8c7c75bed