Modal fix 2