Nazih bug fixing