Got rid of errors in use case 23