added fix for #503 issue
Merge pull request #504 from Helabs/fix-503-issue

added fix for #503 issue