Fixed first issue