Fixed Juan mistakes