Resolved issue 2