fix dialog issues (ref: #553)