Capability setting bug fix