Attempt to fix issue with server on 3/5