Fix the non-standard subs map