Errors fix [4/X]