Added better behaviour for already running instances