Bugfix for last introduce feature