bugfix with modal loading backwards compatibility