Better API usage
Fix issue