Fixed up callback to work for server requests