Added additional flag for TMS compatibility