canvas resize fixed
Merge branch 'canvas-resize-fix'