Feature/modal fix