Make this work on RHEL6
Merge pull request #1388 from jhutar/master

Make this work on RHEL6