721e80be fix did not merge. Adding the fix again.