Canvas removal fix