Bugfix for popup