Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7
Fix Bug with canvas