fixed some change