Fixing enabled on value

Change-Id: I7c6e8b44264b1578379231c8bb3f0a33e5eb5226