Fix for issue with multiple server installation