Gundrak fix