Fix: bug #791