#31 better canvas support.