fix modal with similar ideas