Improve my own stupidity

Change-Id: I4e9d468eb898b245283aa564c8186d4b60e6ae41