v1.7 Wavefunction fixed