fix for assumptions which broke x2 vs x4 scripts (e.g. xsp2/xsp4)