Fix for MXSUP-1802: IndexError: list index out of range