Fixed Canvas not always being set