[BUGFIX] Fix export

Change-Id: I9910e6b99fa74f3efbd15f0111cbd9a53d605c54