Fix for issue#20645
spec fix for for issue#20645
Merge pull request #134 from santana/master

Fix for issue 20645