Changed handling of wavenumber