Fixed gravestone generation