Fix raw-body support