Fix GrappleState