Fixed issue 1 from project CWRC-ccm-rest-api