Merge pull request #2309 from rbalik/patch-1