Fix issue with new formatting