Fixed up to EC #3