Trying to fix geometric factors