bugfix for raw