Move code line to te nicer place

Change-Id: I4eacdcf2410e46324ccade7c255e4293f9dc47fe