(bug) fix pendingController so it works with the server