Fixes #1572

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1577 from live627/rawdata

Fixes #1572