Added fix for Bug 11630
Merge pull request #1099 from jsportaro/master

Added fix for Bug 11630