Fixed bug with incorrect tags

Change-Id: I7daeec2063f5b36c2e27b3f9e7db8c353f36e2c8