Fixed locking on rollup bug by writing simple locking queue explictly for the needed behavior