Fix for bug that occurs when base server forwards data