fix for new server 2