Addressed the issues of comment #19. I have attached a patch for d10. Adding ...