modified workaround and fixed launching bug