Fix function fit size issues