t680--Fixed problem with WHODAS template