GraphicContext -> Canvas fix