Fix edge case with STD