Fixed critical issue with multiple entrants + unit test for the case