ServerPR fix