Quick fix for issue #556
Merge pull request #557 from faishal/master

Quick fix for issue #556