Fixed #9 :)