fixed modal issues