Fixed first issue in #139.