#226 better canvas support