Fix regression introduced by Bug 1029449 - Bug 1042173
Merge pull request #115 from parkouss/1042173

Fix regression introduced by Bug 1029449 - Bug 1042173