Added a 'raw'. fixes #2253.