Fixed #10 in a horrible way