* FIX: sorting bugs