Removed id check
No canvas, master isn't ready yet