Modal issue fixed