Fix to issue #32