Fixed bugs with last update