1st fix for gcruft