#30 repair server bug