Fix to issue #33