API-57 Fixed bug in uses