Resolves issue with fragile matching