Completed

- 125 for takereal fix a bugg