Fixed output with raw option enabled