try to fix some problems