Fixed issue with Build-15