Fix bugs of mis-match due to not consider users size