discussed and fixed