Fixing rectangle/circle draw for canvas move