Modal fix #1