merged fix to ranking