Fixed old dirty code

Change-Id: I0957eaa34a3203a7bfc5e440e0bde8a2b89570f5