Fix for bug #932 (should go into 0.2.9 also)