Task 714 and  	Fix bug on task 350