resolve issue #304