take the sorting out since it causes problems in production