Update method draw

Update method draw to the latest version.

Add workaround to prevent entering triggering a method draw bug which freezes the browser.