change the behaviour of that multi-line corner case
reorganise