Double Modal Fix #52