Changed to fix Olofs recent changes.