clean up fix for #111