fix single and multiple