Possibly fixes #6524