Fix for bug #236 and bug #240