Change a check to avoid unnecessary work if we have canvas