Modified fix for bugid #784. Based on a patch from moriyama@miraclelinux.com (MORIYAM...