1.6 fix single living