Weird format issue fix..