Fix Modal bug- Manli