- Fix task 680