trying to merge with master
fixed for wave.base