Resolved issue 12