Bugfix in Canvas