fixed more in rapport