Fix Modal Bug