Fix_Active

Change-Id: Idb9da3149e34ba54477e90c2284d3c3f6b6c50f7