Fedora code for issue #163