Merge pull request #2400 from RJ2:Bugfix_2