bug fix for CUPUS v2.0