fix completion - An alternate approach

Change-Id: I8a8bbc841bbbe4d9a91f2b381ef8d72c4d94c9f8
Signed-off-by: Manoj Palat <manpalat@in.ibm.com>