fixed the order null error and drag that was getting replaced