Made it more compatible with older Wt