Refs #2 Fixed legacy capability checking