#31 work related to canvas support