Fix for dropping items in order