A re-examination of the structure of SAPO-40