fixed endraw