Fix for #111