resolve issue #126