Fixed issues with last update