Fixed issue with 15B servers