Resolve issue 2