Redo to prevent sig11