Fixed the dropping&sorting bug (almost)