fixing server and public