[Fixed] Draggable bug and Shape bug