fix for Nizar