fix some bugfix