resolve issue 6