Grave check fixing

Fixed error in grave check temporarily. Need to port to the grave class