@thor or @Max can you take a look at https://github.com/facebook/osquery/issues/4658 ? This seems like it was almost fix, but no PR was issued?