Fixed issue #32