Fixed TC and added proper diagnostic