fixed some issues for ibrahim