resolve issue #48