Had some weird interactions with version of the "wave" module: should be
smooth now.