Fix for canvas