possibly fixes #1454