   @list: (callback) ->
     @client.call 'linode.list', null, (err, res) =>
       list = _.map res, _convert_to_instance
-      @amap ((x, cb) =>
-        @_get_ip x.id, (ip) => x.ip_address = ip; cb x),
-        list, (x) -> callback err, x
+      async.map list, (x, cb) =>
+        @_get_ip x.id, (ip) => x.ip_address = ip; cb null, x
+      , (error, results) -> callback err, results
 
   # Returns an instance given its name.
   @get: (name, callback) ->

LinodeClient = (require 'linode-api').LinodeClient
_            = require('underscore')
_s           = require('underscore.string')

LithiumConfig = (require 'lithium_config').LithiumConfig
Instance      = (require 'instance').Instance

     , (err, res) ->
       callback res[0]['IPADDRESS']

# Convert the Linode API JSON representation for a linode server
# into an instance of the Linode class.
_convert_to_instance = (l) =>
