Fixed modal issue