make rivets do better for #57