Fix for room index