resolve issue 31