Bugfix for modal name collision