Issue #46, add modal dialoge again