fixes after and before refacot. cost more that one hour -.-