cleaned working fix