Improve interaction between queue and .apart