Added fix for checking data argument in draw.