Resolved issue 5