Added fix for recently sorted assignment