Fix to issue #30