Fixed a regression in the code, some changes got deleted.