Applied proposed fix
Merge pull request #3270 from boaz001:patch-1