Added diagnostic