Possibly fixes #1.