Added fix for starting server once