for some issues fix