Fixed #25

Previous commit had wrong issue number. Oops.