Fixed first issue

Yay