fixup feature

Change-Id: I1e7e8ad08daf3363fb96652d41e492d140cc032b