Bugfix breaking change 3