resolve issue 45