Fix for ticket:133, merged from eb/bsd 4322:4324.