fix before refacoting