Fix for r40067
Merge pull request #2 from mrkn/fix_for_r40067

Fix for r40067