Implemented #18 by firing sorts from headers