Resolve [issue 1]