Third attempt to fix bug #196