Fix rare case scenario