Merge pull request #1289 from st2/patch-2

Same Issue on #1238 at IIS System