added modal fix #26