updated handling of artefacts involving wake