fix accommodation issues