attempt bug fix for modal issues ...