fixed server bug returning None