Fixed capabilities set issue

Change-Id: I9e95d418fb527cc201f057e9892f1b3e9e698a46