fix issues after new version