(unstable) [fixed] stability fix

Change-Id: I77341e66a5ccd4d1117c3367e07b731c777a5161