fixing issue #32