Formats Fix (hopefully)