Bugfix: fix second phase of case 2