- fixes for Skip cancel