Fixed issue #33