Fix issue with modal window