Fixe part of the error03 and error04 problem