Barnabycourt 999516

999516 - Bug fix for https://bugzilla.redhat.com/show_bug.cgi?id=999516