Fixed multi-family issue