Fixed #87 (Hopefully)