fixed bug MAGE-6808 github issue #35
Merge pull request #236 from magento/pbko-35

fixed bug MAGE-6808 github issue #35