Swapping rooms now work