Fixed mess created by previous reverts