Bugfix when identifier is "base"