fix for bug 924704
Merge pull request #427 from btulchinsky/bug924704

fix for bug 924704