resolve issue #128