Fixing AGDRoid 184