Fix for Xls mapping