resolve issue #32