try to solve some issues