fixed bug fawwaz