Fixed #8

Broken shit. Some shit fixed