diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 38bae138786..c7cbaa18d19 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -770,6 +770,8 @@ public class ApiServer implements HttpRequestHandler {
 
     private boolean isCommandAvailable(User user, String commandName) {
         for(APIAccessChecker apichecker : _apiAccessCheckers) {
+            // Break on the first adapter that validates
+            // FIXME: In case of multiple adapters, this may not be the best way of validation. See CLOUDSTACK-618
             if (apichecker.canAccessAPI(user, commandName))
                 return true;
         }