Fix using Canvas