fix issue #38 - fix capabilities handling