Feat/server fix