bug fix with new raw handler