Fixing earlier mistake