Fix empty room bug 1