Fixing an issue on Fedora 19 

Sorry I made a mess with this pull request, the comments are in 7a98d09