Fix return to lobby

Fix #64