Fix support for foo-*