Fixed CanvasRenderer regression + added unit test