fix for #111
Another fix for #111