Added no-pool patch