Fix for room security issue