committing fix to popup